Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kibana 6.4.x upgrade #28

Merged
merged 4 commits into from
Oct 30, 2018
Merged

Kibana 6.4.x upgrade #28

merged 4 commits into from
Oct 30, 2018

Conversation

gmatheus
Copy link
Contributor

Upgrading Datasweet Formula for Kibana 6.4.x.

Closes #26

Main changes:

To run the project using the scripts provided by Kibana Plugin Generator, you should place this plugin inside ../kibana-extra folder, then run yarn kbn bootstrap and yarn start.

Since this is a big change in project structure, I suggest you to organize plugin releases versions by Kibana versions (just as I did in my plugin). E.g.: Datasweet Formula's v1.1.1 plugin works for Kibana versions from 5.6.x to 6.3.x, version v1.2.0 works for Kibana 6.4.x. What do you think, @tcharlot-datasweet?

@charlotth
Copy link

Hi @gmatheus
Thx for your PR 👍 !
Just one question : i guess with your changes, the plugin can't be updated for previous version of kibana ?

@gmatheus
Copy link
Contributor Author

@tcharlot-datasweet That's right. This is mainly because Elastic team updated the plugin development scripts since Kibana 6.3. The plugin-helpers dependency is now a package inside ../../kibana/packages, so, to run/build the project, you must have an updated Kibana copy inside parent folder.

They also removed some Angular services and changed some classes from Kibana source code, so we had to refactor some imports (just as you did in the first commit of this PR). In the long term, this can generate a lot of conditional-versioning logic in the code.

If you organize plugin releases versions as I mentioned above, sometimes you can backport a feature or bugfix through versions. Example:

  • Imagine you have master branch and v1.1.x branch. Master is for Kibana 6.4.x and v1.1.x branch is for Kibana 5.6.x ~ 6.3.x versions.
  • Some bugfix is pushed to master. You can backport it if needed:
git checkout v1.1.x
git cherry-pick <commit from master>

This applies the bugfix commit from master into v1.1.x branch!

If your team depends directly on previous versions of Kibana, you can do the opposite: set the master branch to point to the current version of plugin and create a new branch to handle 6.4.x version and future updates. In this case, this PR should target your 6.4.x branch instead of master. What do you think?

@charlotth
Copy link

Hi @gmatheus
Can u fix your PR ? I will create a new branch v1 for old kibana (<= 6.3.x) and merge your changes into master.
Thx for your time 👍

@gmatheus
Copy link
Contributor Author

@tcharlot-datasweet Conflicts resolved! Please wait a little bit to merge this one, I just noticed an error while using the Formula Plugin with "other values" feature (from terms bucket aggregation):

image

image

I'll try to fix this in the next days!

@charlotth
Copy link

Ok 👍
Thx :)

@gmatheus
Copy link
Contributor Author

Just realized this is not a plugin-related bug (see this issue), so I guess we're ready merge this PR!

@lcheryl
Copy link

lcheryl commented Oct 29, 2018

@tcharlot-datasweet , do you plan to merge this PR and release it soon? We migrated Kibana to 6.4 and datasweet plugin is not working now. It would be very helpful if this fix releases. Thanks in advance and great work!

@charlotth charlotth merged commit 78acc5d into datasweet:master Oct 30, 2018
@lcheryl
Copy link

lcheryl commented Oct 31, 2018

We installed the latest update and it works now. Really appreciate it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Incorrect Kibana version in plugin [datasweet_formula]. Expected [6.4.0]; found [6.3.2]"
3 participants